popupMenu: Allow specifying an icon on PopupMenuBase.addAction()

This allows passing an optional icon parameter to addAction()
so that a PopupImageMenuItem instance is created instead of a
PopupMenuItem if an icon is specified.

https://bugzilla.gnome.org/show_bug.cgi?id=782166

diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index 53ab7c1004f5722fe80223f301ee080b01bed534..17a5a911a735f87683023685b345f9f13016931f 100644 (file)
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -467,8 +467,13 @@ const PopupMenuBase = new Lang.Class({
         this._setSettingsVisibility(Main.sessionMode.allowSettings);
     },
 
-    addAction: function(title, callback) {
-        let menuItem = new PopupMenuItem(title);
+    addAction: function(title, callback, icon) {
+        let menuItem;
+        if (icon != undefined)
+            menuItem = new PopupImageMenuItem(title, icon);
+        else
+            menuItem = new PopupMenuItem(title);
+
         this.addMenuItem(menuItem);
         menuItem.connect('activate', Lang.bind(this, function (menuItem, event) {
             callback(event);